Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix translation catalog #10933

Merged
merged 23 commits into from Oct 17, 2018
Merged

Fix translation catalog #10933

merged 23 commits into from Oct 17, 2018

Conversation

eternoendless
Copy link
Member

@eternoendless eternoendless commented Oct 9, 2018 •
edited

Questions Answers
Branch? 1.7.5.x
Description? Fix use of wrong translation domain
Type? bug fix
Category? CO
BC breaks? no
Deprecations? no
Fixed ticket? n/a
How to test? No test needed

This change is Reviewable

@eternoendless eternoendless added this to the 1.7.5.0 milestone Oct 9, 2018
@prestonBot prestonBot added 1.7.5.x Branch Bug Type: Bug Waiting for wording Status: action required, waiting for wording labels Oct 9, 2018
PierreRambaud
PierreRambaud previously approved these changes Oct 9, 2018
View reviewed changes
@LouiseBonnard LouiseBonnard removed the Waiting for wording Status: action required, waiting for wording label Oct 9, 2018
@eternoendless eternoendless changed the title Fix wrong translation domain [WIP] Fix wrong translation domain Oct 10, 2018
@prestonBot prestonBot added the Waiting for wording Status: action required, waiting for wording label Oct 10, 2018
@eternoendless eternoendless changed the title [WIP] Fix wrong translation domain Fix wrong translation domain Oct 10, 2018
@eternoendless
Copy link
Member Author

What about now @LouiseBonnard ?

LouiseBonnard
LouiseBonnard reviewed Oct 10, 2018
View reviewed changes
app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf Outdated Show resolved Hide resolved
app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf Outdated Show resolved Hide resolved
app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf Outdated Show resolved Hide resolved
...estaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/memcache_servers.html.twig Outdated
@@ -76,7 +76,7 @@
<thead>
<tr>
<th class="fixed-width-xs"><span class="title_box">{{ 'ID'|trans({}, 'Admin.Global') }}</span></th>
<th><span class="title_box">{{ 'IP address'|trans({}, 'messages') }}</span></th>
<th><span class="title_box">{{ 'IP address'|trans }}</span></th>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IP Address instead. :-(

app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf Outdated Show resolved Hide resolved
app/Resources/translations/default/ModulesBuybuttonliteAdmin.xlf Show resolved Hide resolved
LouiseBonnard
LouiseBonnard reviewed Oct 15, 2018
View reviewed changes
app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated
@@ -435,6 +561,12 @@ File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:479
</file>
<file original="modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="618bfc1f9ba85d07157a388208fe3ff8">
<source>Settings file updated</source>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not a better wording from an existing translation string, like Settings updated in Admin.Global? Formulation is clearer.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we are specifically talking about a settings file, and not settings in general.
Wdyt @Quetzacoalt91 ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly. We are talking about the file config/settings.inc.php available on PS 1.6

app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated
File: modules/autoupgrade/classes/UpgradePage.php:333</note>
</trans-unit>
<trans-unit id="c12803674a35ccc28e5da00a50a84591">
<source><![CDATA[Product images do not appear in the front-office? Try regenerating the thumbnails in Preferences > Images]]></source>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I get on Crowdin is that: Product images do not appear in the front-office? Try regenerating the thumbnails in Preferences > Images, should we change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wording looks the same to me. Am I missing something? The <![CDATA[]]> around is syntactic sugar to prevent the literal > inside the wording from breaking the XML file. You can disregard that, it won't appear in Crowdin.

app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated
File: modules/autoupgrade/classes/UpgradePage.php:340</note>
</trans-unit>
<trans-unit id="a8192fd08a431bf547ebf9a3eaa9b6bb">
<source>Javascript error (parseJSON) detected for action </source>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Watch the space at the end. ;-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Quetzacoalt91 was it left there on purpose?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the action name is concatenated. Note I did not change this string with the latest versions of the module.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok we'll leave it as is then 👍

app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated Show resolved Hide resolved
app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated
File: modules/autoupgrade/views/templates/block/channelInfo.twig:5</note>
</trans-unit>
<trans-unit id="4e140ba723a03baa6948340bf90e2ef6">
<source>Name:</source>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already in Admin.Global.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated Show resolved Hide resolved
@LouiseBonnard LouiseBonnard added Waiting for author Status: action required, waiting for author feedback and removed Waiting for wording Status: action required, waiting for wording labels Oct 15, 2018
@eternoendless eternoendless mentioned this pull request Oct 15, 2018
Merged
@eternoendless
Copy link
Member Author

@LouiseBonnard do you approve?

@eternoendless eternoendless changed the title Fix wrong translation domain Fix translation catalog Oct 17, 2018
@prestonBot prestonBot added the Waiting for wording Status: action required, waiting for wording label Oct 17, 2018
@eternoendless eternoendless removed the Waiting for author Status: action required, waiting for author feedback label Oct 17, 2018
@eternoendless
Copy link
Member Author

ping @LouiseBonnard

@eternoendless eternoendless removed the Waiting for wording Status: action required, waiting for wording label Oct 17, 2018
@eternoendless
Copy link
Member Author

Approved by @LouiseBonnard

@eternoendless eternoendless merged commit 849f367 into PrestaShop:1.7.5.x Oct 17, 2018
@eternoendless eternoendless deleted the fix-wordings branch October 17, 2018 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Quetzacoalt91 Quetzacoalt91 Quetzacoalt91 left review comments

@LouiseBonnard LouiseBonnard LouiseBonnard left review comments

@PierreRambaud PierreRambaud PierreRambaud left review comments

Assignees
No one assigned
Labels
1.7.5.x Branch Bug Type: Bug
Projects
None yet
Milestone
1.7.5.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@eternoendless @PierreRambaud @Quetzacoalt91 @LouiseBonnard @prestonBot